Import updated Android Setupdesign Library 313865830 Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Bug: 157870456 Included changes: - 313865830 Migrate Customview library to androidx - 313032934 Added protection to avoid null default divider. - 311272759 New api seekTo to seek illustration to specific time PiperOrigin-RevId: 313865830 Change-Id: Id4b3bb742a645fb71c228d757f7b50b027f85686
diff --git a/main/src/com/google/android/setupdesign/template/ListMixin.java b/main/src/com/google/android/setupdesign/template/ListMixin.java index 6e2cb20..38928aa 100644 --- a/main/src/com/google/android/setupdesign/template/ListMixin.java +++ b/main/src/com/google/android/setupdesign/template/ListMixin.java
@@ -187,15 +187,17 @@ if (defaultDivider == null) { defaultDivider = listView.getDivider(); } - divider = - DrawableLayoutDirectionHelper.createRelativeInsetDrawable( - defaultDivider, - dividerInsetStart /* start */, - 0 /* top */, - dividerInsetEnd /* end */, - 0 /* bottom */, - templateLayout); - listView.setDivider(divider); + if (defaultDivider != null) { + divider = + DrawableLayoutDirectionHelper.createRelativeInsetDrawable( + defaultDivider, + dividerInsetStart /* start */, + 0 /* top */, + dividerInsetEnd /* end */, + 0 /* bottom */, + templateLayout); + listView.setDivider(divider); + } } } diff --git a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java index 0654b02..2e4fd71 100644 --- a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java +++ b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
@@ -368,6 +368,18 @@ return false; } + /** + * Seeks to specified time position. + * + * @param milliseconds the offset in milliseconds from the start to seek to + * @throws IllegalStateException if the internal player engine has not been initialized + */ + public void seekTo(int milliseconds) { + if (mediaPlayer != null) { + mediaPlayer.seekTo(milliseconds); + } + } + @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) public MediaPlayer getMediaPlayer() { return mediaPlayer; 